Fix QTBUG-19249

Other fixes to windows QML also needed, but this one was package related.
Have setup to launch the sample programs by using windows shortcut (.lnk)
files as these provide the ability to specify the current directory to
run the program from, making it possible to locate the .dll's.

Using shortcut files implies also have to create icons for all the
programs as well.

92 files changed, 215 insertions, 2 deletions

diff --git a/demos/qt3d/cubehouse/cubehouse.pro b/demos/qt3d/cubehouse/cubehouse.pro
index 98a5006d..27eae6f8 100644
--- a/demos/qt3d/cubehouse/cubehouse.pro
+++ b/demos/qt3d/cubehouse/cubehouse.pro
@@ -43,3 +43,7 @@ package {
 } else {
     DESTDIR = ../../../bin
 }
+OTHER_FILES += \
+    cubehouse.rc
+
+RC_FILE = cubehouse.rc
diff --git a/demos/qt3d/cubehouse/cubehouse.rc b/demos/qt3d/cubehouse/cubehouse.rc
new file mode 100644
index 00000000..b40ecdc1
--- /dev/null
+++ b/demos/qt3d/cubehouse/cubehouse.rc
@@ -0,0 +1 @@
+IDI_ICON1               ICON    DISCARDABLE     "qt3d.ico"
diff --git a/demos/qt3d/cubehouse/qt3d.ico b/demos/qt3d/cubehouse/qt3d.ico
new file mode 100644
index 00000000..1d07c43d
--- /dev/null
+++ b/demos/qt3d/cubehouse/qt3d.ico
diff --git a/demos/qt3d/pageflip/pageflip.pro b/demos/qt3d/pageflip/pageflip.pro
index 6c530bdf..3ac9e250 100644
--- a/demos/qt3d/pageflip/pageflip.pro
+++ b/demos/qt3d/pageflip/pageflip.pro
@@ -38,3 +38,8 @@ package {
 } else {
     DESTDIR = ../../../bin
 }
+
+OTHER_FILES += \
+    pageflip.rc
+
+RC_FILE = pageflip.rc
diff --git a/demos/qt3d/pageflip/pageflip.rc b/demos/qt3d/pageflip/pageflip.rc
new file mode 100644
index 00000000..b40ecdc1
--- /dev/null
+++ b/demos/qt3d/pageflip/pageflip.rc
@@ -0,0 +1 @@
+IDI_ICON1               ICON    DISCARDABLE     "qt3d.ico"
diff --git a/demos/qt3d/pageflip/qt3d.ico b/demos/qt3d/pageflip/qt3d.ico
new file mode 100644
index 00000000..1d07c43d
--- /dev/null
+++ b/demos/qt3d/pageflip/qt3d.ico
diff --git a/demos/qt3d/photobrowser3d/photobrowser.rc b/demos/qt3d/photobrowser3d/photobrowser.rc
new file mode 100644
index 00000000..b40ecdc1
--- /dev/null
+++ b/demos/qt3d/photobrowser3d/photobrowser.rc
@@ -0,0 +1 @@
+IDI_ICON1               ICON    DISCARDABLE     "qt3d.ico"
diff --git a/demos/qt3d/photobrowser3d/photobrowser3d.pro b/demos/qt3d/photobrowser3d/photobrowser3d.pro
index 093e0bd4..36c0564a 100644
--- a/demos/qt3d/photobrowser3d/photobrowser3d.pro
+++ b/demos/qt3d/photobrowser3d/photobrowser3d.pro
@@ -94,3 +94,7 @@ symbian {
     }
 }
 
+OTHER_FILES += \
+    photobrowser.rc
+
+RC_FILE = photobrowser.rc
diff --git a/demos/qt3d/photobrowser3d/qt3d.ico b/demos/qt3d/photobrowser3d/qt3d.ico
new file mode 100644
index 00000000..1d07c43d
--- /dev/null
+++ b/demos/qt3d/photobrowser3d/qt3d.ico
diff --git a/demos/qt3d/shapes/qt3d.ico b/demos/qt3d/shapes/qt3d.ico
new file mode 100644
index 00000000..1d07c43d
--- /dev/null
+++ b/demos/qt3d/shapes/qt3d.ico
diff --git a/demos/qt3d/shapes/shapes.pro b/demos/qt3d/shapes/shapes.pro
index f348c076..932c7840 100644
--- a/demos/qt3d/shapes/shapes.pro
+++ b/demos/qt3d/shapes/shapes.pro
@@ -36,3 +36,8 @@ package {
 } else {
     DESTDIR = ../../../bin
 }
+
+OTHER_FILES += \
+    shapes.rc
+
+RC_FILE = shapes.rc
diff --git a/demos/qt3d/shapes/shapes.rc b/demos/qt3d/shapes/shapes.rc
new file mode 100644
index 00000000..b40ecdc1
--- /dev/null
+++ b/demos/qt3d/shapes/shapes.rc
@@ -0,0 +1 @@
+IDI_ICON1               ICON    DISCARDABLE     "qt3d.ico"
diff --git a/demos/qt3d/teaservice/qt3d.ico b/demos/qt3d/teaservice/qt3d.ico
new file mode 100644
index 00000000..1d07c43d
--- /dev/null
+++ b/demos/qt3d/teaservice/qt3d.ico
diff --git a/demos/qt3d/teaservice/teaservice.pro b/demos/qt3d/teaservice/teaservice.pro
index 195f5e0e..7f292419 100644
--- a/demos/qt3d/teaservice/teaservice.pro
+++ b/demos/qt3d/teaservice/teaservice.pro
@@ -38,3 +38,8 @@ package {
 } else {
     DESTDIR = ../../../bin
 }
+
+OTHER_FILES += \
+    teaservice.rc
+
+RC_FILE = teaservice.rc
diff --git a/demos/qt3d/teaservice/teaservice.rc b/demos/qt3d/teaservice/teaservice.rc
new file mode 100644
index 00000000..b40ecdc1
--- /dev/null
+++ b/demos/qt3d/teaservice/teaservice.rc
@@ -0,0 +1 @@
+IDI_ICON1               ICON    DISCARDABLE     "qt3d.ico"
diff --git a/demos/quick3d/model_viewer/model_viewer.pro b/demos/quick3d/model_viewer/model_viewer.pro
index eb042aec..12fc553e 100644
--- a/demos/quick3d/model_viewer/model_viewer.pro
+++ b/demos/quick3d/model_viewer/model_viewer.pro
@@ -57,3 +57,8 @@ package {
     target.path = $$[QT_INSTALL_BINS]
     INSTALLS += target
 }
+
+OTHER_FILES += \
+    model_viewer.rc
+
+RC_FILE = model_viewer.rc
diff --git a/demos/quick3d/model_viewer/model_viewer.rc b/demos/quick3d/model_viewer/model_viewer.rc
new file mode 100644
index 00000000..1b6228c9
--- /dev/null
+++ b/demos/quick3d/model_viewer/model_viewer.rc
@@ -0,0 +1 @@
+IDI_ICON1               ICON    DISCARDABLE     "qtquick3d.ico"
diff --git a/demos/quick3d/model_viewer/qtquick3d.ico b/demos/quick3d/model_viewer/qtquick3d.ico
new file mode 100644
index 00000000..b3b85e37
--- /dev/null
+++ b/demos/quick3d/model_viewer/qtquick3d.ico
diff --git a/demos/quick3d/robo_bounce/qtquick3d.ico b/demos/quick3d/robo_bounce/qtquick3d.ico
new file mode 100644
index 00000000..b3b85e37
--- /dev/null
+++ b/demos/quick3d/robo_bounce/qtquick3d.ico
diff --git a/demos/quick3d/robo_bounce/robo_bounce.pro b/demos/quick3d/robo_bounce/robo_bounce.pro
index aaa6a37c..0db4837b 100644
--- a/demos/quick3d/robo_bounce/robo_bounce.pro
+++ b/demos/quick3d/robo_bounce/robo_bounce.pro
@@ -57,3 +57,8 @@ package {
     target.path = $$[QT_INSTALL_BINS]
     INSTALLS += target
 }
+
+OTHER_FILES += \
+    robo_bounce.rc
+
+RC_FILE = robo_bounce.rc
diff --git a/demos/quick3d/robo_bounce/robo_bounce.rc b/demos/quick3d/robo_bounce/robo_bounce.rc
new file mode 100644
index 00000000..1b6228c9
--- /dev/null
+++ b/demos/quick3d/robo_bounce/robo_bounce.rc
@@ -0,0 +1 @@
+IDI_ICON1               ICON    DISCARDABLE     "qtquick3d.ico"
diff --git a/demos/quick3d/tea_service/qtquick3d.ico b/demos/quick3d/tea_service/qtquick3d.ico
new file mode 100644
index 00000000..b3b85e37
--- /dev/null
+++ b/demos/quick3d/tea_service/qtquick3d.ico
diff --git a/demos/quick3d/tea_service/tea_service.pro b/demos/quick3d/tea_service/tea_service.pro
index 0d277e46..aea0e75e 100644
--- a/demos/quick3d/tea_service/tea_service.pro
+++ b/demos/quick3d/tea_service/tea_service.pro
@@ -57,3 +57,8 @@ package {
     target.path = $$[QT_INSTALL_BINS]
     INSTALLS += target
 }
+
+OTHER_FILES += \
+    tea_service.rc
+
+RC_FILE = tea_service.rc
diff --git a/demos/quick3d/tea_service/tea_service.rc b/demos/quick3d/tea_service/tea_service.rc
new file mode 100644
index 00000000..1b6228c9
--- /dev/null
+++ b/demos/quick3d/tea_service/tea_service.rc
@@ -0,0 +1 @@
+IDI_ICON1               ICON    DISCARDABLE     "qtquick3d.ico"
diff --git a/examples/qt3d/basket/basket.pro b/examples/qt3d/basket/basket.pro
index 62d00617..650a5d12 100644
--- a/examples/qt3d/basket/basket.pro
+++ b/examples/qt3d/basket/basket.pro
@@ -38,3 +38,8 @@ package {
 } else {
     DESTDIR = ../../../bin
 }
+
+OTHER_FILES += \
+    basket.rc
+
+RC_FILE = basket.rc
diff --git a/examples/qt3d/basket/basket.rc b/examples/qt3d/basket/basket.rc
new file mode 100644
index 00000000..b40ecdc1
--- /dev/null
+++ b/examples/qt3d/basket/basket.rc
@@ -0,0 +1 @@
+IDI_ICON1               ICON    DISCARDABLE     "qt3d.ico"
diff --git a/examples/qt3d/basket/qt3d.ico b/examples/qt3d/basket/qt3d.ico
new file mode 100644
index 00000000..1d07c43d
--- /dev/null
+++ b/examples/qt3d/basket/qt3d.ico
diff --git a/examples/qt3d/builder/builder.pro b/examples/qt3d/builder/builder.pro
index ade186ec..bf37619d 100644
--- a/examples/qt3d/builder/builder.pro
+++ b/examples/qt3d/builder/builder.pro
@@ -40,3 +40,7 @@ package {
     DESTDIR = ../../../bin
 }
 
+OTHER_FILES += \
+    builder.rc
+
+RC_FILE = builder.rc
diff --git a/examples/qt3d/builder/builder.rc b/examples/qt3d/builder/builder.rc
new file mode 100644
index 00000000..b40ecdc1
--- /dev/null
+++ b/examples/qt3d/builder/builder.rc
@@ -0,0 +1 @@
+IDI_ICON1               ICON    DISCARDABLE     "qt3d.ico"
diff --git a/examples/qt3d/builder/qt3d.ico b/examples/qt3d/builder/qt3d.ico
new file mode 100644
index 00000000..1d07c43d
--- /dev/null
+++ b/examples/qt3d/builder/qt3d.ico
diff --git a/examples/qt3d/cube/cube.pro b/examples/qt3d/cube/cube.pro
index 2b35dfed..3f6e3e68 100644
--- a/examples/qt3d/cube/cube.pro
+++ b/examples/qt3d/cube/cube.pro
@@ -39,3 +39,8 @@ package {
 } else {
     DESTDIR = ../../../bin
 }
+
+OTHER_FILES += \
+    cube.rc
+
+RC_FILE = cube.rc
diff --git a/examples/qt3d/cube/cube.rc b/examples/qt3d/cube/cube.rc
new file mode 100644
index 00000000..b40ecdc1
--- /dev/null
+++ b/examples/qt3d/cube/cube.rc
@@ -0,0 +1 @@
+IDI_ICON1               ICON    DISCARDABLE     "qt3d.ico"
diff --git a/examples/qt3d/cube/qt3d.ico b/examples/qt3d/cube/qt3d.ico
new file mode 100644
index 00000000..1d07c43d
--- /dev/null
+++ b/examples/qt3d/cube/qt3d.ico
diff --git a/examples/qt3d/cylinder/cylinder.pro b/examples/qt3d/cylinder/cylinder.pro
index d1f7eded..cee19d4e 100644
--- a/examples/qt3d/cylinder/cylinder.pro
+++ b/examples/qt3d/cylinder/cylinder.pro
@@ -38,3 +38,8 @@ package {
 } else {
     DESTDIR = ../../../bin
 }
+
+OTHER_FILES += \
+    cylinder.rc
+
+RC_FILE = cylinder.rc
diff --git a/examples/qt3d/cylinder/cylinder.rc b/examples/qt3d/cylinder/cylinder.rc
new file mode 100644
index 00000000..b40ecdc1
--- /dev/null
+++ b/examples/qt3d/cylinder/cylinder.rc
@@ -0,0 +1 @@
+IDI_ICON1               ICON    DISCARDABLE     "qt3d.ico"
diff --git a/examples/qt3d/cylinder/qt3d.ico b/examples/qt3d/cylinder/qt3d.ico
new file mode 100644
index 00000000..1d07c43d
--- /dev/null
+++ b/examples/qt3d/cylinder/qt3d.ico
diff --git a/examples/qt3d/geometry/geometry.pro b/examples/qt3d/geometry/geometry.pro
index 9bdddc65..66a44052 100644
--- a/examples/qt3d/geometry/geometry.pro
+++ b/examples/qt3d/geometry/geometry.pro
@@ -44,3 +44,8 @@ package {
 } else {
     DESTDIR = ../../../bin
 }
+
+OTHER_FILES += \
+    geometry.rc
+
+RC_FILE = geometry.rc
diff --git a/examples/qt3d/geometry/geometry.rc b/examples/qt3d/geometry/geometry.rc
new file mode 100644
index 00000000..b40ecdc1
--- /dev/null
+++ b/examples/qt3d/geometry/geometry.rc
@@ -0,0 +1 @@
+IDI_ICON1               ICON    DISCARDABLE     "qt3d.ico"
diff --git a/examples/qt3d/geometry/qt3d.ico b/examples/qt3d/geometry/qt3d.ico
new file mode 100644
index 00000000..1d07c43d
--- /dev/null
+++ b/examples/qt3d/geometry/qt3d.ico
diff --git a/examples/qt3d/graphicsview/graphicsview.pro b/examples/qt3d/graphicsview/graphicsview.pro
index 0cbb04e8..f56ba56c 100644
--- a/examples/qt3d/graphicsview/graphicsview.pro
+++ b/examples/qt3d/graphicsview/graphicsview.pro
@@ -57,3 +57,8 @@ package {
 } else {
     DESTDIR = ../../../bin
 }
+
+OTHER_FILES += \
+    graphicsview.rc
+
+RC_FILE = graphicsview.rc
diff --git a/examples/qt3d/graphicsview/graphicsview.rc b/examples/qt3d/graphicsview/graphicsview.rc
new file mode 100644
index 00000000..b40ecdc1
--- /dev/null
+++ b/examples/qt3d/graphicsview/graphicsview.rc
@@ -0,0 +1 @@
+IDI_ICON1               ICON    DISCARDABLE     "qt3d.ico"
diff --git a/examples/qt3d/graphicsview/qt3d.ico b/examples/qt3d/graphicsview/qt3d.ico
new file mode 100644
index 00000000..1d07c43d
--- /dev/null
+++ b/examples/qt3d/graphicsview/qt3d.ico
diff --git a/examples/qt3d/nesting/nesting.pro b/examples/qt3d/nesting/nesting.pro
index bc69b0a5..aaf9638d 100644
--- a/examples/qt3d/nesting/nesting.pro
+++ b/examples/qt3d/nesting/nesting.pro
@@ -38,3 +38,8 @@ package {
 } else {
     DESTDIR = ../../../bin
 }
+
+OTHER_FILES += \
+    nesting.rc
+
+RC_FILE = nesting.rc
diff --git a/examples/qt3d/nesting/nesting.rc b/examples/qt3d/nesting/nesting.rc
new file mode 100644
index 00000000..b40ecdc1
--- /dev/null
+++ b/examples/qt3d/nesting/nesting.rc
@@ -0,0 +1 @@
+IDI_ICON1               ICON    DISCARDABLE     "qt3d.ico"
diff --git a/examples/qt3d/nesting/qt3d.ico b/examples/qt3d/nesting/qt3d.ico
new file mode 100644
index 00000000..1d07c43d
--- /dev/null
+++ b/examples/qt3d/nesting/qt3d.ico
diff --git a/examples/qt3d/solarsystem/qt3d.ico b/examples/qt3d/solarsystem/qt3d.ico
new file mode 100644
index 00000000..1d07c43d
--- /dev/null
+++ b/examples/qt3d/solarsystem/qt3d.ico
diff --git a/examples/qt3d/solarsystem/solarsystem.pro b/examples/qt3d/solarsystem/solarsystem.pro
index 613a12e5..d2f8cb24 100644
--- a/examples/qt3d/solarsystem/solarsystem.pro
+++ b/examples/qt3d/solarsystem/solarsystem.pro
@@ -47,3 +47,8 @@ OTHER_FILES += \
     resources/solar.jpg \
     resources/solar.fsh \
     resources/solar.vsh
+
+OTHER_FILES += \
+    solarsystem.rc
+
+RC_FILE = solarsystem.rc
diff --git a/examples/qt3d/solarsystem/solarsystem.rc b/examples/qt3d/solarsystem/solarsystem.rc
new file mode 100644
index 00000000..b40ecdc1
--- /dev/null
+++ b/examples/qt3d/solarsystem/solarsystem.rc
@@ -0,0 +1 @@
+IDI_ICON1               ICON    DISCARDABLE     "qt3d.ico"
diff --git a/examples/qt3d/tank/qt3d.ico b/examples/qt3d/tank/qt3d.ico
new file mode 100644
index 00000000..1d07c43d
--- /dev/null
+++ b/examples/qt3d/tank/qt3d.ico
diff --git a/examples/qt3d/tank/tank.pro b/examples/qt3d/tank/tank.pro
index 897290fd..98055814 100644
--- a/examples/qt3d/tank/tank.pro
+++ b/examples/qt3d/tank/tank.pro
@@ -43,3 +43,8 @@ package {
 } else {
     DESTDIR = ../../../bin
 }
+
+OTHER_FILES += \
+    tank.rc
+
+RC_FILE = tank.rc
diff --git a/examples/qt3d/tank/tank.rc b/examples/qt3d/tank/tank.rc
new file mode 100644
index 00000000..b40ecdc1
--- /dev/null
+++ b/examples/qt3d/tank/tank.rc
@@ -0,0 +1 @@
+IDI_ICON1               ICON    DISCARDABLE     "qt3d.ico"
diff --git a/examples/qt3d/teapot/qt3d.ico b/examples/qt3d/teapot/qt3d.ico
new file mode 100644
index 00000000..1d07c43d
--- /dev/null
+++ b/examples/qt3d/teapot/qt3d.ico
diff --git a/examples/qt3d/teapot/teapot.pro b/examples/qt3d/teapot/teapot.pro
index 9fab0c7f..8353c487 100644
--- a/examples/qt3d/teapot/teapot.pro
+++ b/examples/qt3d/teapot/teapot.pro
@@ -37,3 +37,8 @@ package {
 } else {
     DESTDIR = ../../../bin
 }
+
+OTHER_FILES += \
+    teapot.rc
+
+RC_FILE = teapot.rc
diff --git a/examples/qt3d/teapot/teapot.rc b/examples/qt3d/teapot/teapot.rc
new file mode 100644
index 00000000..b40ecdc1
--- /dev/null
+++ b/examples/qt3d/teapot/teapot.rc
@@ -0,0 +1 @@
+IDI_ICON1               ICON    DISCARDABLE     "qt3d.ico"
diff --git a/examples/quick3d/basket/basket.pro b/examples/quick3d/basket/basket.pro
index e62c550d..74b6936f 100644
--- a/examples/quick3d/basket/basket.pro
+++ b/examples/quick3d/basket/basket.pro
@@ -58,3 +58,8 @@ package {
     target.path = $$[QT_INSTALL_BINS]
     INSTALLS += target
 }
+
+OTHER_FILES += \
+    basket_qml.rc
+
+RC_FILE = basket_qml.rc
diff --git a/examples/quick3d/basket/basket_qml.rc b/examples/quick3d/basket/basket_qml.rc
new file mode 100644
index 00000000..1b6228c9
--- /dev/null
+++ b/examples/quick3d/basket/basket_qml.rc
@@ -0,0 +1 @@
+IDI_ICON1               ICON    DISCARDABLE     "qtquick3d.ico"
diff --git a/examples/quick3d/basket/qtquick3d.ico b/examples/quick3d/basket/qtquick3d.ico
new file mode 100644
index 00000000..b3b85e37
--- /dev/null
+++ b/examples/quick3d/basket/qtquick3d.ico
diff --git a/examples/quick3d/cube/cube.pro b/examples/quick3d/cube/cube.pro
index 1522158c..d5de2297 100644
--- a/examples/quick3d/cube/cube.pro
+++ b/examples/quick3d/cube/cube.pro
@@ -57,3 +57,8 @@ package {
     target.path = $$[QT_INSTALL_BINS]
     INSTALLS += target
 }
+
+OTHER_FILES += \
+    cube_qml.rc
+
+RC_FILE = cube_qml.rc
diff --git a/examples/quick3d/cube/cube_qml.rc b/examples/quick3d/cube/cube_qml.rc
new file mode 100644
index 00000000..1b6228c9
--- /dev/null
+++ b/examples/quick3d/cube/cube_qml.rc
@@ -0,0 +1 @@
+IDI_ICON1               ICON    DISCARDABLE     "qtquick3d.ico"
diff --git a/examples/quick3d/cube/qtquick3d.ico b/examples/quick3d/cube/qtquick3d.ico
new file mode 100644
index 00000000..b3b85e37
--- /dev/null
+++ b/examples/quick3d/cube/qtquick3d.ico
diff --git a/examples/quick3d/forest/forest.pro b/examples/quick3d/forest/forest.pro
index 445fdd3d..a280e2a0 100644
--- a/examples/quick3d/forest/forest.pro
+++ b/examples/quick3d/forest/forest.pro
@@ -57,3 +57,8 @@ package {
     target.path = $$[QT_INSTALL_BINS]
     INSTALLS += target
 }
+
+OTHER_FILES += \
+    forest.rc
+
+RC_FILE = forest.rc
diff --git a/examples/quick3d/forest/forest.rc b/examples/quick3d/forest/forest.rc
new file mode 100644
index 00000000..1b6228c9
--- /dev/null
+++ b/examples/quick3d/forest/forest.rc
@@ -0,0 +1 @@
+IDI_ICON1               ICON    DISCARDABLE     "qtquick3d.ico"
diff --git a/examples/quick3d/forest/qtquick3d.ico b/examples/quick3d/forest/qtquick3d.ico
new file mode 100644
index 00000000..b3b85e37
--- /dev/null
+++ b/examples/quick3d/forest/qtquick3d.ico
diff --git a/examples/quick3d/lander/lander.pro b/examples/quick3d/lander/lander.pro
index bbbf88f0..934054e1 100644
--- a/examples/quick3d/lander/lander.pro
+++ b/examples/quick3d/lander/lander.pro
@@ -57,3 +57,8 @@ package {
     target.path = $$[QT_INSTALL_BINS]
     INSTALLS += target
 }
+
+OTHER_FILES += \
+    lander.rc
+
+RC_FILE = lander.rc
diff --git a/examples/quick3d/lander/lander.rc b/examples/quick3d/lander/lander.rc
new file mode 100644
index 00000000..1b6228c9
--- /dev/null
+++ b/examples/quick3d/lander/lander.rc
@@ -0,0 +1 @@
+IDI_ICON1               ICON    DISCARDABLE     "qtquick3d.ico"
diff --git a/examples/quick3d/lander/qtquick3d.ico b/examples/quick3d/lander/qtquick3d.ico
new file mode 100644
index 00000000..b3b85e37
--- /dev/null
+++ b/examples/quick3d/lander/qtquick3d.ico
diff --git a/examples/quick3d/matrix_animation/matrix_animation.pro b/examples/quick3d/matrix_animation/matrix_animation.pro
index d82b7b0c..d0b29ff3 100644
--- a/examples/quick3d/matrix_animation/matrix_animation.pro
+++ b/examples/quick3d/matrix_animation/matrix_animation.pro
@@ -57,3 +57,8 @@ package {
     target.path = $$[QT_INSTALL_BINS]
     INSTALLS += target
 }
+
+OTHER_FILES += \
+    matrix_animation.rc
+
+RC_FILE = matrix_animation.rc
diff --git a/examples/quick3d/matrix_animation/matrix_animation.rc b/examples/quick3d/matrix_animation/matrix_animation.rc
new file mode 100644
index 00000000..1b6228c9
--- /dev/null
+++ b/examples/quick3d/matrix_animation/matrix_animation.rc
@@ -0,0 +1 @@
+IDI_ICON1               ICON    DISCARDABLE     "qtquick3d.ico"
diff --git a/examples/quick3d/matrix_animation/qtquick3d.ico b/examples/quick3d/matrix_animation/qtquick3d.ico
new file mode 100644
index 00000000..b3b85e37
--- /dev/null
+++ b/examples/quick3d/matrix_animation/qtquick3d.ico
diff --git a/examples/quick3d/monkeygod/monkeygod.pro b/examples/quick3d/monkeygod/monkeygod.pro
index 5cf786fb..d8909fc1 100644
--- a/examples/quick3d/monkeygod/monkeygod.pro
+++ b/examples/quick3d/monkeygod/monkeygod.pro
@@ -57,3 +57,8 @@ package {
     target.path = $$[QT_INSTALL_BINS]
     INSTALLS += target
 }
+
+OTHER_FILES += \
+    monkeygod.rc
+
+RC_FILE = monkeygod.rc
diff --git a/examples/quick3d/monkeygod/monkeygod.rc b/examples/quick3d/monkeygod/monkeygod.rc
new file mode 100644
index 00000000..1b6228c9
--- /dev/null
+++ b/examples/quick3d/monkeygod/monkeygod.rc
@@ -0,0 +1 @@
+IDI_ICON1               ICON    DISCARDABLE     "qtquick3d.ico"
diff --git a/examples/quick3d/monkeygod/qtquick3d.ico b/examples/quick3d/monkeygod/qtquick3d.ico
new file mode 100644
index 00000000..b3b85e37
--- /dev/null
+++ b/examples/quick3d/monkeygod/qtquick3d.ico
diff --git a/examples/quick3d/moon/moon.pro b/examples/quick3d/moon/moon.pro
index 351153cc..ff388562 100644
--- a/examples/quick3d/moon/moon.pro
+++ b/examples/quick3d/moon/moon.pro
@@ -57,3 +57,8 @@ package {
     target.path = $$[QT_INSTALL_BINS]
     INSTALLS += target
 }
+
+OTHER_FILES += \
+    moon.rc
+
+RC_FILE = moon.rc
diff --git a/examples/quick3d/moon/moon.rc b/examples/quick3d/moon/moon.rc
new file mode 100644
index 00000000..1b6228c9
--- /dev/null
+++ b/examples/quick3d/moon/moon.rc
@@ -0,0 +1 @@
+IDI_ICON1               ICON    DISCARDABLE     "qtquick3d.ico"
diff --git a/examples/quick3d/moon/qtquick3d.ico b/examples/quick3d/moon/qtquick3d.ico
new file mode 100644
index 00000000..b3b85e37
--- /dev/null
+++ b/examples/quick3d/moon/qtquick3d.ico
diff --git a/examples/quick3d/photoroom/photoroom.pro b/examples/quick3d/photoroom/photoroom.pro
index e4299ad9..960389bf 100644
--- a/examples/quick3d/photoroom/photoroom.pro
+++ b/examples/quick3d/photoroom/photoroom.pro
@@ -57,3 +57,8 @@ package {
     target.path = $$[QT_INSTALL_BINS]
     INSTALLS += target
 }
+
+OTHER_FILES += \
+    photoroom.rc
+
+RC_FILE = photoroom.rc
diff --git a/examples/quick3d/photoroom/photoroom.rc b/examples/quick3d/photoroom/photoroom.rc
new file mode 100644
index 00000000..1b6228c9
--- /dev/null
+++ b/examples/quick3d/photoroom/photoroom.rc
@@ -0,0 +1 @@
+IDI_ICON1               ICON    DISCARDABLE     "qtquick3d.ico"
diff --git a/examples/quick3d/photoroom/qtquick3d.ico b/examples/quick3d/photoroom/qtquick3d.ico
new file mode 100644
index 00000000..b3b85e37
--- /dev/null
+++ b/examples/quick3d/photoroom/qtquick3d.ico
diff --git a/examples/quick3d/shaders/qtquick3d.ico b/examples/quick3d/shaders/qtquick3d.ico
new file mode 100644
index 00000000..b3b85e37
--- /dev/null
+++ b/examples/quick3d/shaders/qtquick3d.ico
diff --git a/examples/quick3d/shaders/shaders.pro b/examples/quick3d/shaders/shaders.pro
index 1f2c71ec..258c4198 100644
--- a/examples/quick3d/shaders/shaders.pro
+++ b/examples/quick3d/shaders/shaders.pro
@@ -57,3 +57,8 @@ package {
     target.path = $$[QT_INSTALL_BINS]
     INSTALLS += target
 }
+
+OTHER_FILES += \
+    shaders.rc
+
+RC_FILE = shaders.rc
diff --git a/examples/quick3d/shaders/shaders.rc b/examples/quick3d/shaders/shaders.rc
new file mode 100644
index 00000000..1b6228c9
--- /dev/null
+++ b/examples/quick3d/shaders/shaders.rc
@@ -0,0 +1 @@
+IDI_ICON1               ICON    DISCARDABLE     "qtquick3d.ico"
diff --git a/examples/quick3d/sphere/qtquick3d.ico b/examples/quick3d/sphere/qtquick3d.ico
new file mode 100644
index 00000000..b3b85e37
--- /dev/null
+++ b/examples/quick3d/sphere/qtquick3d.ico
diff --git a/examples/quick3d/sphere/sphere.pro b/examples/quick3d/sphere/sphere.pro
index 1dab9904..f9772559 100644
--- a/examples/quick3d/sphere/sphere.pro
+++ b/examples/quick3d/sphere/sphere.pro
@@ -57,3 +57,8 @@ package {
     target.path = $$[QT_INSTALL_BINS]
     INSTALLS += target
 }
+
+OTHER_FILES += \
+    sphere.rc
+
+RC_FILE = sphere.rc
diff --git a/examples/quick3d/sphere/sphere.rc b/examples/quick3d/sphere/sphere.rc
new file mode 100644
index 00000000..1b6228c9
--- /dev/null
+++ b/examples/quick3d/sphere/sphere.rc
@@ -0,0 +1 @@
+IDI_ICON1               ICON    DISCARDABLE     "qtquick3d.ico"
diff --git a/examples/quick3d/tutorials/qtquick3d.ico b/examples/quick3d/tutorials/qtquick3d.ico
new file mode 100644
index 00000000..b3b85e37
--- /dev/null
+++ b/examples/quick3d/tutorials/qtquick3d.ico
diff --git a/examples/quick3d/tutorials/teapot_bounce_qml/qtquick3d.ico b/examples/quick3d/tutorials/teapot_bounce_qml/qtquick3d.ico
new file mode 100644
index 00000000..b3b85e37
--- /dev/null
+++ b/examples/quick3d/tutorials/teapot_bounce_qml/qtquick3d.ico
diff --git a/examples/quick3d/tutorials/teapot_bounce_qml/teapot_bounce_qml.pro b/examples/quick3d/tutorials/teapot_bounce_qml/teapot_bounce_qml.pro
index a6418379..9fe40169 100644
--- a/examples/quick3d/tutorials/teapot_bounce_qml/teapot_bounce_qml.pro
+++ b/examples/quick3d/tutorials/teapot_bounce_qml/teapot_bounce_qml.pro
@@ -57,3 +57,8 @@ package {
     target.path = $$[QT_INSTALL_BINS]
     INSTALLS += target
 }
+
+OTHER_FILES += \
+    teapot_bounce_qml.rc
+
+RC_FILE = teapot_bounce_qml.rc
diff --git a/examples/quick3d/tutorials/teapot_bounce_qml/teapot_bounce_qml.rc b/examples/quick3d/tutorials/teapot_bounce_qml/teapot_bounce_qml.rc
new file mode 100644
index 00000000..1b6228c9
--- /dev/null
+++ b/examples/quick3d/tutorials/teapot_bounce_qml/teapot_bounce_qml.rc
@@ -0,0 +1 @@
+IDI_ICON1               ICON    DISCARDABLE     "qtquick3d.ico"
diff --git a/examples/quick3d/tutorials/teapot_qml/qtquick3d.ico b/examples/quick3d/tutorials/teapot_qml/qtquick3d.ico
new file mode 100644
index 00000000..b3b85e37
--- /dev/null
+++ b/examples/quick3d/tutorials/teapot_qml/qtquick3d.ico
diff --git a/examples/quick3d/tutorials/teapot_qml/teapot_qml.pro b/examples/quick3d/tutorials/teapot_qml/teapot_qml.pro
index 4e8f5ecd..2e26695b 100644
--- a/examples/quick3d/tutorials/teapot_qml/teapot_qml.pro
+++ b/examples/quick3d/tutorials/teapot_qml/teapot_qml.pro
@@ -50,3 +50,8 @@ package {
     target.path = $$[QT_INSTALL_BINS]
     INSTALLS += target
 }
+
+OTHER_FILES += \
+    teapot_qml.rc
+
+RC_FILE = teapot_qml.rc
diff --git a/examples/quick3d/tutorials/teapot_qml/teapot_qml.rc b/examples/quick3d/tutorials/teapot_qml/teapot_qml.rc
new file mode 100644
index 00000000..1b6228c9
--- /dev/null
+++ b/examples/quick3d/tutorials/teapot_qml/teapot_qml.rc
@@ -0,0 +1 @@
+IDI_ICON1               ICON    DISCARDABLE     "qtquick3d.ico"
diff --git a/src/scripts/build_win_package.nsi b/src/scripts/build_win_package.nsi
index f036d7ff..7a3b57d1 100644
--- a/src/scripts/build_win_package.nsi
+++ b/src/scripts/build_win_package.nsi
@@ -92,9 +92,45 @@ FunctionEnd
 Section "MainSection" SEC01
   SetOverwrite try
   CreateDirectory "$SMPROGRAMS\QtQuick3D"
+  CreateDirectory "$SMPROGRAMS\QtQuick3D\Examples"
+  CreateDirectory "$SMPROGRAMS\QtQuick3D\Demos"
+
+  ; For the CreateShortCut command, the outpath is actually used for the working directory.
+  ; By setting $INSTDIR\bin to the working directory all these lnk targets should be able
+  ; to find their dependent dll's without needing to set the path
+  SetOutPath "$INSTDIR\bin"
+  CreateShortCut "$SMPROGRAMS\QtQuick3D\QtQuick3D.lnk" "$INSTDIR\quick3d\bin\qglinfo.exe"
+  CreateShortCut "$DESKTOP\QtQuick3D.lnk" "$INSTDIR\quick3d\bin\qglinfo.exe"
+  CreateShortCut "$SMPROGRAMS\QtQuick3D\Examples\Basket.lnk" "$INSTDIR\quick3d\bin\basket_qml.exe"
+  CreateShortCut "$SMPROGRAMS\QtQuick3D\Examples\Cube.lnk" "$INSTDIR\quick3d\bin\cube_qml.exe"
+  CreateShortCut "$SMPROGRAMS\QtQuick3D\Examples\Forest.lnk" "$INSTDIR\quick3d\bin\forest.exe"
+  CreateShortCut "$SMPROGRAMS\QtQuick3D\Examples\Lander.lnk" "$INSTDIR\quick3d\bin\lander.exe"
+  CreateShortCut "$SMPROGRAMS\QtQuick3D\Examples\Matrix Animation.lnk" "$INSTDIR\quick3d\bin\matrix_animation.exe"
+  CreateShortCut "$SMPROGRAMS\QtQuick3D\Examples\Monkey God.lnk" "$INSTDIR\quick3d\bin\monkeygod.exe"
+  CreateShortCut "$SMPROGRAMS\QtQuick3D\Examples\Moon.lnk" "$INSTDIR\quick3d\bin\moon.exe"
+  CreateShortCut "$SMPROGRAMS\QtQuick3D\Examples\Photo Room.lnk" "$INSTDIR\quick3d\bin\photoroom.exe"
+  CreateShortCut "$SMPROGRAMS\QtQuick3D\Examples\Shaders.lnk" "$INSTDIR\quick3d\bin\shaders.exe"
+  CreateShortCut "$SMPROGRAMS\QtQuick3D\Examples\Sphere.lnk" "$INSTDIR\quick3d\bin\sphere.exe"
+  CreateShortCut "$SMPROGRAMS\QtQuick3D\Examples\Teapot.lnk" "$INSTDIR\quick3d\bin\teapot_qml.exe"
+  CreateShortCut "$SMPROGRAMS\QtQuick3D\Examples\Teapot Bounce.lnk" "$INSTDIR\quick3d\bin\teapot_bounce_qml.exe"
+  CreateShortCut "$SMPROGRAMS\QtQuick3D\Examples\Basket (C++).lnk" "$INSTDIR\quick3d\bin\basket.exe"
+  CreateShortCut "$SMPROGRAMS\QtQuick3D\Examples\Builder.lnk" "$INSTDIR\quick3d\bin\builder.exe"
+  CreateShortCut "$SMPROGRAMS\QtQuick3D\Examples\Cube (C++).lnk" "$INSTDIR\quick3d\bin\cube.exe"
+  CreateShortCut "$SMPROGRAMS\QtQuick3D\Examples\Cylinder.lnk" "$INSTDIR\quick3d\bin\cylinder.exe"
+  CreateShortCut "$SMPROGRAMS\QtQuick3D\Examples\Geometry.lnk" "$INSTDIR\quick3d\bin\geometry.exe"
+  CreateShortCut "$SMPROGRAMS\QtQuick3D\Examples\Graphicsview.lnk" "$INSTDIR\quick3d\bin\graphicsview.exe"
+  CreateShortCut "$SMPROGRAMS\QtQuick3D\Examples\Nesting.lnk" "$INSTDIR\quick3d\bin\nesting.exe"
+  CreateShortCut "$SMPROGRAMS\QtQuick3D\Examples\Tank.lnk" "$INSTDIR\quick3d\bin\tank.exe"
+  CreateShortCut "$SMPROGRAMS\QtQuick3D\Examples\Teapot (C++).lnk" "$INSTDIR\quick3d\bin\teapot.exe"
+  CreateShortCut "$SMPROGRAMS\QtQuick3D\Demos\Model Viewer.lnk" "$INSTDIR\quick3d\bin\model_viewer.exe"
+  CreateShortCut "$SMPROGRAMS\QtQuick3D\Demos\Robo Bounce.lnk" "$INSTDIR\quick3d\bin\robo_bounce.exe"
+  CreateShortCut "$SMPROGRAMS\QtQuick3D\Demos\Tea Service.lnk" "$INSTDIR\quick3d\bin\tea_service.exe"
+  CreateShortCut "$SMPROGRAMS\QtQuick3D\Demos\Cube House.lnk" "$INSTDIR\quick3d\bin\cubehouse.exe"
+  CreateShortCut "$SMPROGRAMS\QtQuick3D\Demos\Page Flip.lnk" "$INSTDIR\quick3d\bin\pageflip.exe"
+  CreateShortCut "$SMPROGRAMS\QtQuick3D\Demos\Photo-browser 3D.lnk" "$INSTDIR\quick3d\bin\photobrowser3d.exe"
+  CreateShortCut "$SMPROGRAMS\QtQuick3D\Demos\Shapes.lnk" "$INSTDIR\quick3d\bin\shapes.exe"
+  CreateShortCut "$SMPROGRAMS\QtQuick3D\Demos\Tea Service (C++).lnk" "$INSTDIR\quick3d\bin\teaservice.exe"
 
-  CreateShortCut "$SMPROGRAMS\QtQuick3D\QtQuick3D.lnk" "$INSTDIR\quick3d\bin\run_start_program.bat" "" "$INSTDIR\quick3d\bin\qglinfo.exe"
-  CreateShortCut "$DESKTOP\QtQuick3D.lnk" "$INSTDIR\quick3d\bin\run_start_program.bat" "" "$INSTDIR\quick3d\bin\qglinfo.exe"
   ; bin imports include lib mkspecs plugins quick3d
   SetOutPath "$INSTDIR\quick3d\bin"
   File "${MK_INST_ROOT}${QT_PREFIX_PATH}\bin\*.exe"